From f3740fb2ab05ed86fa8a2f5540383eac6479eee7 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Wed, 31 Oct 2001 23:58:31 +0000 Subject: [PATCH] unset the GTK_REALIZED flag so we don't re-enter when we are destroyed 2001-11-01 Michael Meeks * gtk/gtksocket.c (gtk_socket_unrealize): unset the GTK_REALIZED flag so we don't re-enter when we are destroyed from the plug side. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtksocket.c | 2 ++ 8 files changed, 44 insertions(+) diff --git a/ChangeLog b/ChangeLog index 4a18077772..a21b7e218a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-11-01 Michael Meeks + + * gtk/gtksocket.c (gtk_socket_unrealize): unset the + GTK_REALIZED flag so we don't re-enter when we are + destroyed from the plug side. + Wed Oct 31 18:23:47 2001 Owen Taylor * gtk/gtkoptionmenu.c (gtk_option_menu_detacher): diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 4a18077772..a21b7e218a 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +2001-11-01 Michael Meeks + + * gtk/gtksocket.c (gtk_socket_unrealize): unset the + GTK_REALIZED flag so we don't re-enter when we are + destroyed from the plug side. + Wed Oct 31 18:23:47 2001 Owen Taylor * gtk/gtkoptionmenu.c (gtk_option_menu_detacher): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4a18077772..a21b7e218a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2001-11-01 Michael Meeks + + * gtk/gtksocket.c (gtk_socket_unrealize): unset the + GTK_REALIZED flag so we don't re-enter when we are + destroyed from the plug side. + Wed Oct 31 18:23:47 2001 Owen Taylor * gtk/gtkoptionmenu.c (gtk_option_menu_detacher): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 4a18077772..a21b7e218a 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +2001-11-01 Michael Meeks + + * gtk/gtksocket.c (gtk_socket_unrealize): unset the + GTK_REALIZED flag so we don't re-enter when we are + destroyed from the plug side. + Wed Oct 31 18:23:47 2001 Owen Taylor * gtk/gtkoptionmenu.c (gtk_option_menu_detacher): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 4a18077772..a21b7e218a 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2001-11-01 Michael Meeks + + * gtk/gtksocket.c (gtk_socket_unrealize): unset the + GTK_REALIZED flag so we don't re-enter when we are + destroyed from the plug side. + Wed Oct 31 18:23:47 2001 Owen Taylor * gtk/gtkoptionmenu.c (gtk_option_menu_detacher): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 4a18077772..a21b7e218a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2001-11-01 Michael Meeks + + * gtk/gtksocket.c (gtk_socket_unrealize): unset the + GTK_REALIZED flag so we don't re-enter when we are + destroyed from the plug side. + Wed Oct 31 18:23:47 2001 Owen Taylor * gtk/gtkoptionmenu.c (gtk_option_menu_detacher): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 4a18077772..a21b7e218a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2001-11-01 Michael Meeks + + * gtk/gtksocket.c (gtk_socket_unrealize): unset the + GTK_REALIZED flag so we don't re-enter when we are + destroyed from the plug side. + Wed Oct 31 18:23:47 2001 Owen Taylor * gtk/gtkoptionmenu.c (gtk_option_menu_detacher): diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c index 0b6661c03d..c8802c2e6a 100644 --- a/gtk/gtksocket.c +++ b/gtk/gtksocket.c @@ -340,6 +340,8 @@ gtk_socket_unrealize (GtkWidget *widget) { GtkSocket *socket = GTK_SOCKET (widget); + GTK_WIDGET_UNSET_FLAGS (widget, GTK_REALIZED); + if (socket->plug_widget) { _gtk_plug_remove_from_socket (GTK_PLUG (socket->plug_widget), socket); -- 2.30.2